Fix gcc-3.4 compiler errors (submitted by Takebe Akio)

diff --git a/xen/arch/ia64/linux-xen/efi.c b/xen/arch/ia64/linux-xen/efi.c
index c75f0fe728af78323676b9922425986a6c8cc46a..d42935ddeab656d2e362e653bfc1b3ac44ea005e 100644 (file)
--- a/xen/arch/ia64/linux-xen/efi.c
+++ b/xen/arch/ia64/linux-xen/efi.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/time.h>
-#include <linux/efi.h>
 
 #include <asm/io.h>
 #include <asm/kregs.h>
@@ -33,6 +32,8 @@
 #include <asm/processor.h>
 #include <asm/mca.h>
 
+#include <linux/efi.h>
+
 #define EFI_DEBUG      0
 
 extern efi_status_t efi_call_phys (void *, ...);

diff --git a/xen/arch/ia64/linux-xen/mm_contig.c b/xen/arch/ia64/linux-xen/mm_contig.c
index 896a871c3b277a1102c0f586d8594ca265c34fe8..ee1d51063640284d78bcc54280810fd2a6ece5a9 100644 (file)
--- a/xen/arch/ia64/linux-xen/mm_contig.c
+++ b/xen/arch/ia64/linux-xen/mm_contig.c
@@ -16,7 +16,6 @@
  */
 #include <linux/config.h>
 #include <linux/bootmem.h>
-#include <linux/efi.h>
 #include <linux/mm.h>
 #include <linux/swap.h>
 
@@ -26,6 +25,7 @@
 #include <asm/sections.h>
 #include <asm/mca.h>
 
+#include <linux/efi.h>
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 static unsigned long num_dma_physpages;
 #endif